prova merge
Merge branch 'master' of https://github.com/studentemag/blackjack.git
riprova
Merge branch 'master' of https://github.com/studentemag/blackjack.git

Conflicts:
	src/blackjack/Black.java