a
Merge branch 'master' of https://github.com/lesquoyb/projet_synthese_client

Conflicts:
	DiagrammeDeClasses.dia~
tests unitaires