commiting to get new code
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/maze/MazeUi.java
merge