docblocks + small fixes
Merge branch 'master' of https://github.com/DaveRandom/WebSocketDemo into DaveRandom-master

Conflicts:
	public/js/main.js