Merge pull request #9 from lefnire/pets

Keeping my pets branch updated
Last four potions for new pet system
Merge pull request #739 from Shaners/pets

Last Four Potions for New Pet System from Lemoness