Add in branch bran1.

Add in branch bran1.
Add another line.
Add third line in master.

Add third line in master.
Merge branch 'bran1'

Conflicts:
	test.txt