Fixed contains
Merge branch 'master' of https://github.com/Rivirland/EWI3620TU-GROUP01

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/MazeRunner/.indexes/df/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MazeRunner/.markers
	.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/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/80.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1498219845.index
	.metadata/.plugins/org.eclipse.jdt.core/2451842633.index
	.metadata/.plugins/org.eclipse.jdt.core/305854171.index
	.metadata/.plugins/org.eclipse.jdt.core/3065916431.index
	.metadata/.plugins/org.eclipse.jdt.core/3133528496.index
	.metadata/.plugins/org.eclipse.jdt.core/3974580528.index
	.metadata/.plugins/org.eclipse.jdt.core/4108727661.index
	.metadata/.plugins/org.eclipse.jdt.core/4155206848.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.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.ui.workbench.texteditor/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	MazeRunner/worlds/world.txt