temp removed machines
Merge branch 'master' of github.com:johnrees/fablabs