fix network
fix network
Merge branch 'master' of https://github.com/proudaut/GGJ

Conflicts:
	Assets/Script/SocketClient.cs
	Assets/Script/SocketServer.cs