Sprint 2 Review
Merge branch 'master' of https://github.com/fuzzy880/bottle_social