Added websockets to main.go
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/microchat/index.html