test commit
jedi
Merge branch 'master' of https://github.com/Bilb/moustache-coloree

Conflicts:
	include/ColorClass.h
map
algo principal