Started cleaning up client_server.c. Now there are several helper functions to assist with the connections
Fixed some merge issues
Fixed merge error