冲突解决123
Merge branch 'master' of github.com:wangxiaogang/Wang

Conflicts:
	App1/App.xaml.cs