Example of websocket.
Merge branch 'master' of github.com:krajcovic/node-js-getting-started

Conflicts:
	package.json