Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	BlackJack/src/com/uwaterloo/helper/Betting.java