Merge branch 'master' of https://github.com/loljimmo12/Stijgmachine into spel1

Conflicts:
	src/stijgmachine/jti1a1/nl/controller/Main.java
	src/stijgmachine/jti1a1/nl/objects/GameCursor.java