Instructionslul
Merge remote-tracking branch 'origin/master'

Conflicts:
	MazeEscapeApp/bin/mazeEscapeApp/MazeEscapeApp.class