greeting added to Hello.java
Merge branch 'master' of https://github.com/changt/git-repo-example

Conflicts:
	Hello.java
Merge branch 'master' of https://github.com/changt/git-repo-example