Separated client and server sockets
Merge branch 'master' of https://github.com/snijhof/Machiavelli