Ajout d'un repertoire "client"
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/Client.java