Added Scene and stuff

Had to do this to sync...
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/ourgame/LevelOne$1.class
	build/classes/ourgame/LevelOne.class
	src/ourgame/LevelOne.java