Update
Merge branch 'master' of github.com:VicBoss/NodeChat

Conflicts:
	README.md