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

Conflicts:
	CardShop/CardShop/Controllers/DiscountController.cs