Init
Merge branch 'master' of https://github.com/flyfy1/hackatron