Mise en page
Resolution conflit ....
Merge remote-tracking branch 'origin/master'

Conflicts:
	Keynote/parts/remplissage_germe.tex
	Keynote/report.aux
	Keynote/report.log
	Keynote/report.pdf
	Keynote/report.synctex.gz