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

Conflicts:
	src/blackjack/AutoPanel.java
commit
Merge branch 'master' of https://github.com/jordanking/blackjack