Merge branch 'master' of github.com:BorjaMartin/herosinatra
Merge branch 'master' of github.com:BorjaMartin/herosinatra
update heros: elros
Merge branch 'master' of https://github.com/IrisGaleano/herosinatra