boten testen
Merge branch 'Marcel.Minigame1' of https://github.com/praetore/Project-2 into Marcel.Minigame1

Conflicts:
	MiniGame1-ControleCentrum/GameController.ctxt
	MiniGame1-ControleCentrum/Haven.java
	MiniGame1-ControleCentrum/Vrachtschip.ctxt
	MiniGame1-ControleCentrum/Vrachtschip.java
	MiniGame1-ControleCentrum/project.greenfoot