add third line
commit after new branch
commit back to master
again master
add new to master first line
Merge branch 'addline'

Conflicts:
	gittutorial/src/gittutorial/HelloGit.java