commit 2
Merge branch 'master' of https://github.com/mechMach/rethinkdb-example-nodejs-chat

Conflicts:
	app.js
commit 2