modified:   maze.hs
Merge branch 'master' of https://github.com/davorklju/cps590

Conflicts:
	ass4/maze.hs

	modified:   maze.hs