Levi's job
Merge branch 'master' of https://github.com/Rivirland/EWI3620TU-GROUP01

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.history/44/70d070edc056001314e08c852ea1fbfa
	.metadata/.plugins/org.eclipse.core.resources/.history/57/b089f4c2825600131bc1f5399dfeeab0
	.metadata/.plugins/org.eclipse.core.resources/.history/9f/d070c57b645700131d8c8b24d7882b57
	.metadata/.plugins/org.eclipse.core.resources/.projects/MazeRunner/.indexes/e4/88/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MazeRunner/.indexes/e4/be/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MazeRunner/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/MazeRunner/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
	.metadata/.plugins/org.eclipse.debug.core/.launches/LevelEditorMain.launch
	.metadata/.plugins/org.eclipse.debug.core/.launches/MazeRunner (1).launch
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.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/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/MazeRunner/2013/11/48/refactorings.history
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/MazeRunner/2013/11/48/refactorings.index
	.metadata/.plugins/org.eclipse.ltk.ui.refactoring/dialog_settings.xml
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml
	MazeRunner/LevelEditor/MethodesVoorLevelEditor.java
	MazeRunner/bin/LevelEditor$1.class
	MazeRunner/bin/LevelEditor.class
	MazeRunner/bin/enemy/Enemy.class
	MazeRunner/bin/engine/Control.class
	MazeRunner/bin/engine/GameObject.class
	MazeRunner/bin/engine/Level.class
	MazeRunner/bin/engine/Maze.class
	MazeRunner/bin/engine/MazeRunner.class
	MazeRunner/bin/engine/Player.class
	MazeRunner/bin/engine/Portal.class
	MazeRunner/bin/engine/UserInput.class
	MazeRunner/src/engine/MazeRunner.java
	MazeRunner/src/engine/Player.java
	MazeRunner/src/engine/UserInput.java