Shop Stage 1
Merge branch 'McLeodLaptop'

Conflicts:
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene$1.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene$2.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene$3.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene.class