update
Merge branch 'master' of github.com:AlexandreBlanchet/perso

Conflicts:
	rapport.tex