op
Merge branch 'master' of github.com:Bliinky/projetReseau

Conflicts:
	client/client.cc
	client/infoClient.txt