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

Conflicts:
	client/fichiers/infoFichiers.txt
	client/fichiers/tot.png.dos/tot.png59