resolved conflict
Merge branch 'dev' of https://github.com/railsrumble/r13-team-90 into dev
#11 #12 some logic for iteration view and fixes
Merge branch 'dev' of https://github.com/railsrumble/r13-team-90 into dev