Joris is een held! (En 'New World' werkt)
Merge branch 'master' of https://github.com/Rivirland/EWI3620TU-GROUP01

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/MazeRunner/.indexes/e4/11/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MazeRunner/.indexes/e4/5f/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MazeRunner/.indexes/e4/be/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MazeRunner/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/MazeRunner/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.jdt.core/2451842633.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/4.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/5.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/6.png
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	MazeRunner/bin/engine/MazeRunner.class
	MazeRunner/bin/levelEditor/LevelEditor.class
	MazeRunner/bin/menu/GameMenu.class
	MazeRunner/bin/menu/LevelMenu.class
	MazeRunner/bin/menu/Main.class