Merge branch 'master' of github.com:IrisGaleano/herosinatra
Merge branch 'master' of github.com:BorjaMartin/herosinatra
Add escudo torreon img
Switch dragon verde and camafeo draconico imgs
Merge pull request #59 from IrisGaleano/master

change icons