Ajout du suo pour eviter les conflits
Merge branch 'master' of https://github.com/yanickouellet/tp4-prog

Conflicts:
	TP4-YOuellet-MTrottier/TP4-YOuellet-MTrottier.v12.suo