Branch2 1st commit
Branch2 2nd commit
Merge branch 'Branch2'

Conflicts:
	README.txt