names for users
Merge remote-tracking branch 'origin/master'

Conflicts:
	blackjack-backend/controllers/desk.js
error handling