update heros: arya & yunnow
update druida: 19<-->18
update druida: 19<-->20
update heros: elro's skills
fix conflicts in heros
Merge branch 'master' of github.com:BorjaMartin/herosinatra
Merge pull request #86 from IrisGaleano/master

heros & skills druida