Summary

Description
f

f
Merge branch 'master' of https://github.com/flotteur/projet_synthese

Conflicts:
	client_synthese/GitCheat.txt