Update from master
Minor brush ups
Merge branch 'chris-branch' of https://github.com/jladdjr/lord-of-the-rings into chris-branch
Minor tweaks
Delete newfile.py
Renamed to MonsterSet.
Minor tweak.
Minor tweak.
Space now requires description parameter
Update world_map.py
Update from Master.
Update from Master
Minor tweak.
Update from Master
Updated to a one-character case.
Added getHp and getDamage methods.
Mispelled something.
Merge with master.
Added addInventory method.
Merge branch 'chris-branch' into master-merge-with-chris

Conflicts:
	game.py
	player.py
	test.py