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

Conflicts:
	soloBlackJackTests.py
efw
awef