#9 ERB script partial changes
Merge branch 'dev' of https://github.com/railsrumble/r13-team-90 into dev