First REAL commit
Merge branch 'master' of https://github.com/jphmf/hackathon