Finished EndGame
Merge branch 'endgame' into final

Conflicts:
	src/stijgmachine/jti1a1/nl/objects/GameObject.java