Merge branch 'master' of https://github.com/ICYN/3d

holder.scad

@@ -6,3 +6,22 @@ difference()
 		cylinder(11,9,9);
 	}
 }
+
+//Triangle
+scale(.3)
+{
+	rotate([0,90,0])
+	{
+		difference()
+		{
+	    		cube(10);
+			translate([-3,10,0])
+			{
+				rotate([45,0,0])
+				{
+					cube(30);
+				}
+			}
+		}
+	}
+}

stick.scad

@@ -0,0 +1,24 @@
+//base
+cylinder(3,4,4);
+
+    
+translate([0,0,3])
+{
+    cylinder(12,4,2);
+}
+//stick
+translate([0,0,15])
+{
+    cylinder(50,2,2);
+}
+
+//bottom rounded bit
+translate([0,0,-5])
+{
+    cylinder(5,2,4);
+}
+//sphere at bottom
+translate([0,0,-5])
+{
+    sphere(4);
+}