Updated src/Makefile to build both server and client

* Note that nether build ATM
* Fixed #include bug in given code