Push Ajout Antoine 13/11
Merge branch 'master' of https://github.com/nicolas-blanc/algoPeintre

Conflicts:
	tri_paquets.adb
	tri_paquets.ads
	type_projet.ads