fuck you
Merge branch 'master' of https://github.com/ryucc/cnchat

Conflicts:
	server.py