test
Merge branch 'Engin' of https://github.com/NicolasVerbeek/Rapport-jury into Engin

Conflicts:
	Rapport/Rapport_jury.log
	Rapport/Rapport_jury.pdf
	Rapport/Rapport_jury.synctex.gz
	Rapport/Rapport_jury.toc
	Rapport/Sous-parties/aspects-techniques.aux
	Rapport/Sous-parties/bilan.aux
	Rapport/Sous-parties/conclusion.aux
	Rapport/Sous-parties/engin-final.aux