update heros: elros & elyssa
update heros: diablillo chillon
update heros: dado magiorco out
Merge branch 'master' of https://github.com/IrisGaleano/herosinatra