estimation
Merge remote-tracking branch 'origin/master'

Conflicts:
	blackjack-backend/console.log
online list
Merge remote-tracking branch 'origin/master'

Conflicts:
	blackjack-backend/console.log
Merge remote-tracking branch 'origin/master'

Conflicts:
	blackjack-backend/console.log