branch4 commit1

added third line to doc2 (conflicts with branch3 commit1)
Merge remote-tracking branch 'origin/branch4'

Conflicts:
	doc2.txt