validation avec le client
Merge branch 'master' of https://github.com/gabriellamer/TP3Conception

Conflicts:
	src/model/Client.java