Merge branch 'master' of github.com:BorjaMartin/herosinatra
Merge branch 'master' of github.com:BorjaMartin/herosinatra
add imgs
update heros: Daniel Haro change armor
imgs modified
Merge branch 'master' of github.com:IrisGaleano/herosinatra
change imgs arms & protections
Merge pull request #123 from IrisGaleano/master

change heros & imgs