update hello.java on local
Merge remote-tracking branch 'origin/master'

Conflicts:
	git_eclipse/src/git_eclipse/Hello.java