question 1 reecrite
Merge branch 'master' of https://github.com/jdewasseige/projet-1225

Conflicts:
	rapport4/tache4.tex