Merge branch 'master' of https://github.com/Romain-Ly/PRES

Conflicts:
	rapport_final/section/Annexe1.aux
	rapport_final/section/contexte-techno.tex
00h29
update