Commit 7
Merge branch 'Branch2'

Conflicts:
	2.txt