commit
Merge branch 'master' of https://github.com/SceauRond/cartographer

Conflicts:
	cartographer
	src/cartographer.o
	src/utilities.o
commit