Moved server/server_utilities up one directory

Also modified makefiles to account for the change.

server/clients/client_manager.cpp

@@ -27,7 +27,7 @@
 #include <chrono>
 
 std::list<int> ClientManager::CheckConnections() {
-	//list of clients to disconnect
+	//return a list of clients to disconnect
 	std::list<int> returnList;
 
 	for (auto& it : elementMap) {
@@ -60,6 +60,7 @@ void ClientManager::HandlePong(ServerPacket* const argPacket) {
 }
 
 int ClientManager::Create(IPaddress add) {
+	//return the client's index
 	ClientData& client = elementMap[counter];
 	client.SetAddress(add);
 	return counter++;

server/clients/client_manager.hpp

@@ -31,6 +31,8 @@
 #include <list>
 #include <map>
 
+//DOCS: The heartbeat system is built into ClientManager
+
 class ClientManager: public Singleton<ClientManager> {
 public:
 	//methods

server/clients/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../server_utilities ../../common/network ../../common/network/packet_types ../../common/utilities
+INCLUDES+=. .. ../../common/network ../../common/network/packet_types ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))