some more changes that I forgot to branch before doing
Merge branch 'master' of https://github.com/JoshNussbaum/classroom-hero-rails