initial commit
work in progress
big commit
merged
Merge branch 'master' of github.com:joelfischer/homemadeshop