tearing stuff
ignore yo
Merge branch 'develop' of https://github.com/mborjesson/GameJam-1.0.git
into develop

Conflicts:
	src/gamejam10/options/Options.java
	src/gamejam10/states/GameState.java
Merge branch 'develop' of https://github.com/mborjesson/GameJam-1.0.git
into develop

Conflicts:
	.settings/org.eclipse.core.resources.prefs