hotfix
Merge branch 'master' into helloworld2

Conflicts:
	.classpath
	.gitignore
	src/com/zyf/HelloWorld.java