commit 02
Merge branch 'master' of https://github.com/zhonglihua/Demo.git

Conflicts:
	test/src/demo2.java