Updated ChatClient and Server

Now working!