Checking in latest.
Merge branch 'master' of https://github.com/decapyre/AngelHack-app