Test server/client
Merge branch 'master' of https://github.com/snake984/TchatOn

Conflicts:
	tchat.c