Rapport
Merge branch 'master' of http://github.com/SteackHC/AlgoDist

Conflicts:
	Rapport/RapportAlgoDist_PGuillouxYRiou.tex
merge fait