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