Branch 1 commit 1
Branch 3 commit
Merge branch 'Branch1' into Branch3

Conflicts:
	Branch3.txt
	README.md
Merge branch 'Branch3' of git://github.com/peterstaplesMW/Test1 into Branch3

Conflicts:
	Branch3.txt
	README.md