a
Merge branch 'master' of https://github.com/rcpirate/chatRoom

Conflicts:
	models.py
	server.py
	settings.py