commit before merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	rendu_final.aux
	rendu_final.log
	rendu_final.pdf
	rendu_final.tex
	rendu_final.toc
Plein de trucs