123
Merge remote-tracking branch 'origin/ai3'
AI stage 3
test
added basis for leveling up, experience and gold
leveling up, experience and gold work
derp
Merge branch 'master' of https://github.com/guy101100/cageFight.git

Conflicts:
	CageFight/bin/CageFight.apk
	CageFight/bin/classes.dex
	CageFight/bin/classes/co/nz/splashYay/cagefight/entities/Player.class
	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
	CageFight/bin/dexedLibs/andengine-2e8662f71f3f91f749bc99f82b466dc5.jar
	CageFight/bin/dexedLibs/andenginephysicsbox2dextension-f07d31652226fc26ce4dcc1328ed1bd9.jar
	CageFight/bin/dexedLibs/android-support-v4-6bca689373676fd6092c1c993fe7a872.jar
	CageFight/bin/resources.ap_
	CageFight/src/co/nz/splashYay/cagefight/scenes/GameScene.java
Shop Stage 1
12
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
Missing class added
Shop stage 2