.
Merge branch 'master' of github.com:npatta01/blackjack

Conflicts:
	.gitignore