Merge pull request #120 from IrisGaleano/master

update inventario: add anillo de los deseos
add baculo
Merge branch 'master' of github.com:BorjaMartin/herosinatra
Merge branch 'master' of github.com:IrisGaleano/herosinatra