added user socket connecting
Merge branch 'master' of https://github.com/tptak/djangodash

Conflicts:
	memo/templates/main_view.html