Adding web socket goodness in for Twitter
Merge branch 'master' of https://github.com/jamesdoc/stat-board

Conflicts:
	main.py
	templates/wstest.html