preface 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	Rapport/Rapport_jury.log
	Rapport/Rapport_jury.pdf
	Rapport/Rapport_jury.synctex.gz