ERB structure improvements, iteration modal window stab
Merge branch 'dev' of https://github.com/railsrumble/r13-team-90 into dev