End of 3.4
Merge branch 'master' of https://github.com/Gaspi/Projet-MAP431

Conflicts:
	question3-4.edp