ab
a
a
Merge branch 'develop' of github.com:david4chao/Test1 into develop

Conflicts:
	Demo1_B/Demo1/Demo1_C.suo
Merge branch 'develop' of github.com:david4chao/Test1 into develop
Merge branch 'develop' of github.com:david4chao/Test1 into develop
some changes