Fix several imgs
Merge branch 'master' of github.com:BorjaMartin/herosinatra
Merge remote-tracking branch 'iris/master'