merge
Merge branch 'master' of https://github.com/Gatux/Traitement-images

Conflicts:
	Projet/main.m