Commentaar weggehaald
Merge branch 'master' of
https://github.com/TheMasterofDome/java.eindopdracht.git

Conflicts:
	Eindopdracht/src/bosbrand/controller/Controller.java