changed to erb
Merge branch 'master' of https://github.com/JTFrancis/social_trainer into switch_to_erb
Merge pull request #4 from JTFrancis/switch_to_erb

Switch to erb