resources
Merge branch 'master' of https://github.com/jordanking/blackjack

Conflicts:
	src/view/SettingsPanel.java