New client-side
New client-side
shit commit
shit commit
shit commit
Merge branch 'master' of https://github.com/koffing/node-chat

Conflicts:
	models/user.js
	models/users.js