add text on branch1 on HelloGit2.java

add text on branch1 on HelloGit2.java
Merge remote-tracking branch 'origin/branch1'

Conflicts:
	HelloGit2.java