First branch commit
Merge remote-tracking branch 'remotes/origin/branch1' into branch1

Conflicts:
	src/HelloGit.java