Merge pull request #129 from IrisGaleano/master

Maestro de armas
Merge branch 'master' of github.com:IrisGaleano/herosinatra