[Présentation] Fixage des conflits
Merge branch 'master' of github.com:TriComp/Documents

Conflicts:
	presentation/presentation.tex