algo again
bloub
Merge branch 'master' of https://github.com/SceauRond/cartographer

Conflicts:
	dedale
	src1/.#break.c
	src1/algo.c