Changed the name of the mocked object in hopes of getting a test to pass.
Merge branch 'master' of https://github.com/egreene/PracticeGDVP

Conflicts:
	CardShop/CardShop/Controllers/BaseballCardController.cs
	CardShop/CardShopTest/ControllerTests/BaseballCardControllerTest.cs
Removed all tests that weren't suppose to be pushed.