Merge branch 'master' of github.com:zabacad/networking-scootaloo
Fixed client and server.