Merge branch 'master' of ssh://git.gag.com/scm/git/web/gag.com

[web/gag.com] / homeshop / index.mdwn

diff --git a/homeshop/index.mdwn b/homeshop/index.mdwn
index 216b936d883c363f8bf15fa617539085db545b0b..3110c36b7a65bea74247b9467f2916b96c04b286 100644 (file)
--- a/homeshop/index.mdwn
+++ b/homeshop/index.mdwn
@@ -1,4 +1,18 @@
-# Industrial Hobbies Mill
+# Home Machine Shop
 
-This space won't be empty forever!
+My paternal grandfather was, among other things, a machinist.  I learned an
+immense amount from him, and one of the lasting impacts is that I really
+enjoy making interesting and useful things myself...
 
+# Machines #
+
+* Atlas 12x36 inch manual lathe
+* Industrial Hobbies 3-axis mill converted to CNC
+* MAX-NC 10 table top 3-axis CNC mill
+* [Ultimaker](ultimaker/) 3D printer
+
+# Projects #
+
+* [CND FPGA Board](cncfpga/)
+I designed during the process of converting a big 3-axis milling
+machine to CNC.