hello
Merge branch 'master' of https://github.com/ConanLao/tcp

Conflicts:
	send.c
	struct.h