change for eclipse
for eclipse
Merge branch 'helloworld2' of
ssh://git@github.com/zangyunfei/helloworld.git into helloworld2

Conflicts:
	src/com/zyf/HelloWorld2.java