merge
Merge branch 'master' of https://github.com/JYStars/LearnHowToUse

Conflicts:
	Sports.v11.suo
	Sports/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache