Merge branch 'master' of github.com:andres-erbsen/chatterbox into server
There's still a bug if you run go test several times quickly in succession. Message uploading is tested, though.
Fixed server concurrency bug and added message uploading
Added pb.go file
Merging, fixed proto conflicts