merge
merge
Merge branch 'master' of https://github.com/snake984/TchatOn
Reader works
Merge branch 'master' of https://github.com/snake984/TchatOn

Conflicts:
	r_client.c