Hopefully I don't fuck everything up...
Merge branch 'master' of https://github.com/MadDevTalk/devMaze

Conflicts:
	DevMaze-desktop/bin/IN_MAZE.png
	DevMaze-desktop/bin/NOT_IN_MAZE.png
	DevMaze-html/.settings/com.google.gwt.eclipse.core.prefs
Merge branch 'master' of https://github.com/MadDevTalk/devMaze
Merge branch 'master' of https://github.com/MadDevTalk/devMaze