test
Merge branch 'master' of https://github.com/vjpaleo/nodechatcom

Conflicts:
	_@todo