Hopefully this doesn't screw up

fo realz
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Dealer.java