ok
Merge remote-tracking branch 'refs/remotes/origin/master'
Merge remote-tracking branch 'refs/remotes/origin/master'
k
k
Merge remote-tracking branch 'refs/remotes/origin/master'
jk
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	TCPClient/Client.cs
	TCPServer/Server.cs
Ajout authentification user-pass (MESSAGE_TYPE_cONNEXION)
changer connection pour authetifier et ensuite updater le client+afficher liste ami (ajout MESSAGE_TYPE_UPDATE_FRIEND)
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	ClasseCommunes/CustomMessage.cs
	TCPClient/Client.cs
	TCPClient/frmAuthentification.cs