Level resets when player dies
Merge branch 'master' of https://github.com/acoustichero/testgame
merge!!! yay!
Conflicts:
	src/com/cs331/testgame/scene/GameScene.java