Debut du "socket" management
Merge branch 'master' of github.com:Parasithe/Battleship

Conflicts:
	Serveur/main.cpp
Merge branch 'master' of github.com:Parasithe/Battleship