dsf
Merge branch 'master' of github.com:xuyuchends/ASPPatterns

Conflicts:
	Chap3.Layered/Chap3.Layered.Model/CustomerType.cs
	Chap3.Layered/Chap3.Layered.Model/DiscountFactory.cs