no message
Merge branch 'master' of https://github.com/Tarkle1987/Distactions_of_DOOM

Conflicts:
	MazeRunner/Mazes.txt
	MazeRunner/src/CompanionCube.java
	MazeRunner/src/MazeObject.java
	MazeRunner/src/MazeRunner.java