ubisan hacks
Merge branch 'master' of https://github.com/jmesmon/mmaze

Conflicts:
	Makefile
no include needed