Work
Merge branch 'master' of https://github.com/JackNeus/MazeGame

Conflicts:
	src/Maze.java