test
Merge branch 'master' of https://github.com/tfwcn/TFW

Conflicts:
	MVC5test/MVC5test/MVC5test.csproj
	MVC5test/MVC5test/Views/Index/Index.cshtml
	MVC5test/MVC5test/Views/Shared/_Layout.cshtml