client
Merge branch 'serdev' of https://github.com/zhangjianxi/mysocket into serdev

Conflicts:
	client.c

server.c
Merge branch 'master' of https://github.com/zhangjianxi/mysocket