commit branch1
second change
master change
master change2
Merge remote-tracking branch 'origin/branch1'
Merge branch 'master' into branch3

Conflicts:
	ca.jsong.git.first/src/ca/jsong/git/first/GitTest2.java