More handshaking stuff
Merge branch 'master' of https://github.com/david-mansen/Networking_Project