First commit
"merge conflict with readme"
Merge branch 'master' of https://github.com/mvthen/TCPChatClient