Merge origin/master

Conflicts:
	src/blackjack/BlackJack.java