处理模式
Merge branch 'master' of https://github.com/rcpirate/chatRoom

Conflicts:
	controller.py
	define.py
	models.py
	server.py