Bug fix: wrong name for erb.
Merge branch 'master' into SG
Merge branch 'SG' of github.com:davincicoders/2013-q2-rails-1 into SG