#6 whenever fixed
Merge branch 'develop' of github.com:railsrumble/r13-team-357 into develop