.
Merge branch 'switch_to_erb'
Merge branch 'master' of https://github.com/JTFrancis/social_trainer