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

Conflicts:
	.metadata/.log
	.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/.root/92.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.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.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	MazeRunner/bin/engine/Maze.class
	MazeRunner/bin/engine/MazeRunner.class
	MazeRunner/bin/engine/Player.class
	MazeRunner/bin/engine/Portal.class
	MazeRunner/bin/engine/Sound.class
	MazeRunner/bin/items/TrapDropped.class
	MazeRunner/bin/menu/Main.class
	MazeRunner/bin/playerStates/PlayerStateCloak.class
	MazeRunner/bin/playerStates/PlayerStateGun.class
	MazeRunner/src/engine/Player.java