base test
Merge branch 'master' of https://github.com/guy101100/cageFight.git

Conflicts:
	CageFight/bin/classes/co/nz/splashYay/cagefight/Player.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/ServerGameScene.class
	CageFight/src/co/nz/splashYay/cagefight/scenes/ServerGameScene.java