socket controller objects created for server and client
got rid of a test socket message.
fixed merge conflicts