Converted 8-space tabs to 4 spaces.
Inventory now stores a copy of player instead of bouncing the inventory
through State.
Items are now static classes.
Merge branch 'master' into inventory_refactor

Conflicts:
	game/src/gameScreen.py
	game/src/inventoryScreen.py
	game/src/player.py
Fixing broken test