added Inventory to Player class
Merge branch 'master' of https://github.com/fhirt/dungeon_escape into fhirt_development
Merge pull request #2 from fhirt/fhirt_development

Fhirt development