updates to client.cpp and clientsocket files
Merge branch 'master' of https://github.com/ShitWeDo/stimpy