merge
Merge branch 'master' of github.com:gereXciTer/blackjack

Conflicts:
	blackjack-backend/console.log
ignoring console.log