changed makefile, and fixed client and server, to test sockets