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

Conflicts:
	client/client
	client/client.o