début diagnos
Merge branch 'master' of https://github.com/xavierm02/Projet-M1

Conflicts:
	presentation/presentation.tex