develop
Merge pull request #42 from kevinyby/develop

modify WHInventory