Merge branch 'master' of https://github.com/michael2xiang/Architecture

Conflicts:
	ConsoleApplication1/ConsoleApplication1/Program.cs
Merge branch 'master' of https://github.com/michael2xiang/Architecture

Conflicts:
	ConsoleApplication1/ConsoleApplication1/Program.cs