Added link for discount
Merge branch 'master' of https://github.com/egreene/PracticeGDVP
Merge branch 'master' of https://github.com/egreene/PracticeGDVP
Working on unit testing
Merge branch 'master' of https://github.com/egreene/PracticeGDVP

Conflicts:
	CardShop/CardShopTest/ControllerTests/AdminControllerTests.cs
Finishing up Tests and resolving conflicts

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

Conflicts:
	CardShop/CardShop/Controllers/AdminController.cs