make all work
Merge branch 'master' of github.com:parallel-p/thehat