commit 3
Merge branch 'master' of https://github.com/zhonglihua/Test1.git

Conflicts:
	demo/src/demo1.java