# Conflicts: # include/Engine/Network/Client.h # src/Engine/Network/Client.cpp
Reactored code, clumped together variables in PlayerDefinition.h. Integrated server with entity system.