Changed to wage measurement
Merge branch 'master' of https://github.com/jordanking/blackjack

Conflicts:
	src/blackjack/SettingsPanel.java