commit
Merge branch 'master' of https://github.com/bhamhawker/Card-Game-1

Conflicts:
	.idea/workspace.xml
commit