gestion du conf
mergeMerge branch 'master' of https://github.com/Zelfrost/Comanche

Conflicts:
	comanche