Server sends users in the mix to the client
Merge branch 'master' of github.com:madisonmay13/coplay

Conflicts:
	routes/user.js
	views/settings.jade