npm redis add
Merge branch 'master' of https://github.com/cs-sonar/node-chat

Conflicts:
	package.json