Improved If Battle exercise
Merge branch 'master' into sampleSolution

Conflicts:
	source/bbv.CleanCodeWorkshop.Test/IfBattle/DiscountCalculatorTest.cs