From: Bdale Garbee <bdale@gag.com>
Date: Sat, 18 Aug 2012 18:05:08 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/web/gag.com
X-Git-Url: https://git.gag.com/?p=web%2Fgag.com;a=commitdiff_plain;h=cc1193c55f5eebb1826e91d169ca0334056015a4;hp=6a2706570b1a72055c027f8f521c65cbd85dff34

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

diff --git a/homeshop/index.mdwn b/homeshop/index.mdwn
index 83cfcdf..3110c36 100644
--- a/homeshop/index.mdwn
+++ b/homeshop/index.mdwn
@@ -9,6 +9,7 @@ enjoy making interesting and useful things myself...
 * 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 #