Second commit
Third commit
Merge branch 'master' into Branch1

Conflicts:
	repo1text.txt