ugh
Merge branch 'master' of https://github.com/JMarple/HackBean2014
heroku fix
Merge branch 'master' of https://github.com/JMarple/HackBean2014