Résumé et autres
*Merge branch 'master' of https://github.com/joakim-d/orchestra-inferni

Conflicts:
	docs/rapport.pdf
Ecriture partie synchronisation
Merge branch 'master' of https://github.com/joakim-d/orchestra-inferni

Conflicts:
	docs/rapport.pdf
	docs/rapport.tex