nothing
Merge branch 'master' of https://github.com/lijianping/NetworkChat

Conflicts:
	networkchar/networkchat_client/networkchat_client/my_socket.cpp
程序退出，正常关闭套接字