4th commit

-worked on combat system more, auto works properly.
-levels now load from xml, which also loads gettable items and keywords
for actions/things in each room
-removed some deprecated stuff from player/inventory classes
Merge branch 'master' of https://github.com/snarkbait/dungeonOfAltamira