完善了之前的功能代码
Merge branch 'master' of github.com:taufikxu/network

Conflicts:
	ourChat.v12.suo
	ourChat/bin/Debug/ourChat.exe
	ourChat/bin/Debug/ourChat.pdb
	ourChat/bin/Debug/zh-Hans/ourChat.resources.dll
	ourChat/bin/Debug/zu/ourChat.resources.dll
	ourChat/obj/Debug/ourChat.csproj.GenerateResource.Cache
	ourChat/obj/Debug/ourChat.exe
	ourChat/obj/Debug/ourChat.pdb
	ourChat/obj/Debug/zh-Hans/ourChat.resources.dll
	ourChat/obj/Debug/zu/ourChat.resources.dll