Level met verdieping
Merge branch 'master' of https://github.com/Rivirland/EWI3620TU-GROUP01

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/MazeRunner/.indexes/91/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MazeRunner/.indexes/df/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/.projects/MazeRunnerOLDvakantie/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/MazeRunnerOLDvakantie/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/79.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.jdt.core/2451842633.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	MazeRunner/bin/engine/Level.class
	MazeRunner/bin/engine/Maze.class
	MazeRunner/bin/engine/MazeRunner.class
	MazeRunner/bin/playerStates/PlayerStateCloak.class
	MazeRunner/bin/playerStates/PlayerStateGun.class
	MazeRunner/bin/playerStates/PlayerStateTrap.class
	MazeRunner/src/engine/Maze.java
commit
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/1498219845.index
	.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.launching/.install.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	MazeRunner/bin/engine/MazeRunner.class
	MazeRunner/bin/engine/Portal.class
	MazeRunner/bin/items/TrapDropped.class
	MazeRunner/bin/menu/Main.class