small changes with erb
Merge branch 'kevins_branch'