Add some mock users
Merge branch 'master' of github.com:rtoal/chuzr

Conflicts:
	server/models/user.js