Merge remote-tracking branch 'iris/master' into feature/iris_integration
Fix line ending in hero/7
Merge remote-tracking branch 'iris/master'
Merge branch 'master' of github.com:BorjaMartin/herosinatra