Testing whether effects are now working
Merge branch 'master' of https://github.com/Cobrabb/Rougelike
Fixed some equip/unequip bugs.  Updated effects.
Merge branch 'master' of https://github.com/Cobrabb/Rougelike
Fixed the NaN's in equipped items.