Workinggit add .1
Merge branch 'django_socketio' of github.com:poseidon4o/pp into django_socketio

Conflicts:
	web_site/views.py