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

Conflicts:
	client/fichiers.cc
	client/fichiers/infoFichiers.txt
a
Merge branch 'master' of https://github.com/Bliinky/projetReseau

Conflicts:
	client2/client.cc
	client2/fichiers/infoFichiers.txt~
a
Merge branch 'master' of https://github.com/Bliinky/projetReseau

Conflicts:
	client2/client.cc
	client2/fichiers.cc
	client2/fichiers.h
	client2/fichiers/infoFichiers.txt
	client2/infoClient.txt
	client2/teste
	client2/teste.cc
a
a