initial
Merge branch 'master' of https://github.com/holdenrehg/AngelHack-2014