Working on testing
Merge branch 'master' of https://github.com/egreene/PracticeGDVP

Conflicts:
	CardShop/CardShopTest/CardShopTest.csproj