Player test.
Merge branch 'master' of https://github.com/Scrumplesplunge/immolation-warehouse

Conflicts:
	ImmolationWarehouse/src/net/compsoc/ox/iw/MainGame.java