drop user
Merge branch 'master' of github.com:lionn2/pythonChat

Conflicts:
	chat/views.py
Merge branch 'master' of github.com:lionn2/pythonChat