commits to tatrc computer
Merge remote-tracking branch 'origin/master'

Conflicts:
	Server2/bin/Debug/Server2.exe
	Server2/bin/Debug/Server2.pdb
	Server2/obj/x86/Debug/Server2.csproj.FileListAbsolute.txt
	Server2/obj/x86/Debug/Server2.exe
	Server2/obj/x86/Debug/Server2.pdb
	Socket_test/SocketClient.cs
	Socket_test/bin/Debug/Socket_test.exe
	Socket_test/bin/Debug/Socket_test.pdb
	Socket_test/obj/x86/Debug/Client1.csproj.FileListAbsolute.txt
	Socket_test/obj/x86/Debug/Socket_test.exe
	Socket_test/obj/x86/Debug/Socket_test.pdb