Ajout 3 scans
Merge branch 'master' of https://github.com/jdewasseige/projet-1225

Conflicts:
	outil/main.m