update, doesnt compile yet
Merge remote-tracking branch 'origin/master'

Conflicts:
	blackjack.oz