First commit
Merge branch 'master' of https://github.com/brainwaves-fossters/hackathon14