Commit

Had to commit this to sync apparently
Merge branch 'master' of https://github.com/czaloj/Avos

Conflicts:
	src/chao/game/MainGame.java
	src/chao/game/TestScene.java