client refactor
Merge branch 'master' of github.com:jlguenego/sandbox

Conflicts:
	tcp_test/tcp_client.c
adsf