Trap en trap neer en duer in leveleditor
Merge branch 'master' of https://github.com/Tarkle1987/Distactions_of_DOOM

Conflicts:
	MazeRunner/Mazes.txt
	MazeRunner/src/Main/MazeRunner.java
	MazeRunner/src/Maze/Maze.java
Trap en traptextures op goede plaats
Merge branch 'master' of https://github.com/Tarkle1987/Distactions_of_DOOM

Conflicts:
	MazeRunner/src/Main/MazeRunner.java
Trap op lopen toegevoegd
Merge branch 'master' of https://github.com/Tarkle1987/Distactions_of_DOOM

Conflicts:
	MazeRunner/src/leveleditor/LevelEditor.java
bla
Trap op en af gesolved
Merge branch 'master' of https://github.com/Tarkle1987/Distactions_of_DOOM

Conflicts:
	MazeRunner/src/Main/MazeRunner.java
Merge branch 'master' of https://github.com/Tarkle1987/Distactions_of_DOOM

Conflicts:
	MazeRunner/src/Main/MazeRunner.java