Remove extra main functions and update makefiles to generate object files instead of executables
Add main loop to listen for commands
Implement handler function for the NetworkController on the client side
Merge remote-tracking branch 'origin'

Conflicts:
	peer/Peer.h