Added 3rd file in branch2
Changed file2
Merge branch 'branch2'

Conflicts:
	file2