Got an errror!

Got an error
Merge remote-tracking branch 'origin/master'

Conflicts:
	Blackjack/Blackjack.java