Makefile now compiles both client and server (rather than 2 seperate makefiles)