version working on craptop
Merge branch 'master' of github.com:jamessnee/hackathon-space