temp commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/nl/sest/gamejam/controller/MainGameState.java
	src/main/java/nl/sest/gamejam/controller/TheGame.java
	src/main/java/nl/sest/gamejam/view/ViewGame.java
merge
merge