From 78dbdc6a7c96b147864fec3c06b9adcbc9d6c66b Mon Sep 17 00:00:00 2001
From: dan <ICYN30@Gmail.com>
Date: Sat, 22 Aug 2015 15:17:46 -0400
Subject: [PATCH 1/2] Added a fancy stick

---
 stick.scad | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 stick.scad

diff --git a/stick.scad b/stick.scad
new file mode 100644
index 0000000..d444acc
--- /dev/null
+++ b/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);
+}

From 3b0004e5089d604cef4db2df3f6aec51b120f79a Mon Sep 17 00:00:00 2001
From: dan <ICYN30@Gmail.com>
Date: Sat, 22 Aug 2015 15:37:38 -0400
Subject: [PATCH 2/2] Working on the coaster holder

---
 holder.scad | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/holder.scad b/holder.scad
index 5b04e27..dc8e956 100644
--- a/holder.scad
+++ b/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);
+				}
+			}
+		}
+	}
+}