Commiting WIP
Merge branch 'master' of https://github.com/makenai/heroschool-app