added settings and STUFF useless ;)
Merge branch 'master' of https://github.com/ChiNonBatteNonJava/ShapeCrash

Conflicts:
	src/com/chinonbattenonjava/saproject/GameState.java