update heros: delete items
Merge branch 'master' of github.com:Borja/herosinatra
imgs modified
img Elros modified
Merge branch 'master' of github.com:Borja/herosinatra
add Zurda img
Merge remote-tracking branch 'iris/master' into feature/iris_integration
Fix line ending in hero/7
Merge branch 'master' of github.com:Borja/herosinatra
Merge remote-tracking branch 'iris/master'
Merge pull request #168 from IrisGaleano/master

update heros: delete items
Merge branch 'master' of github.com:BorjaMartin/herosinatra
update heros
Merge pull request #173 from IrisGaleano/master

update heros
update joyas: some joyas
update joyas: all
update joyas: all II
Merge pull request #174 from IrisGaleano/master

update joyas: some joyas
Fix licenciado
Fix druida imgs and my profile