impelemented websockets
Merge branch 'polling'

Conflicts:
	index.js