Updating chat
Merge branch 'master' of https://github.com/conchrist/dogma

Conflicts:
	SocketServer/server.go