users
Merge branch 'master' of github.com:bengui/giombu

Conflicts:
	routes/users.js