Skybox
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/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/.indexes/e4/c0/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/.projects/MazeRunner/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/44.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/2451842633.index
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	MazeRunner/bin/engine/Maze.class
	MazeRunner/bin/engine/MazeRunner.class
	MazeRunner/bin/items/BulletHolder.class
	MazeRunner/bin/items/TrapDropped.class
	MazeRunner/bin/items/TrapHolder.class
	MazeRunner/bin/menu/Teken.class
	MazeRunner/levels/level1_o.txt
	MazeRunner/src/engine/MazeRunner.java
	MazeRunner/src/items/BulletHolder.java
	MazeRunner/src/items/TrapDropped.java
	MazeRunner/src/items/TrapHolder.java
	MazeRunner/src/menu/Teken.java