homework
Merge branch 'master' of https://github.com/inv-ftw/RoR-GeekHub