Change origdoc.txt again for hopeful succesful merge
Merge branch 'master' into SharedBranch

Conflicts:
	Subfolder1/Subfolder2/orig.txt
Make another change to orig.txt
Merge branch 'master' into SharedBranch
Rename master folders with master
Merge branch 'master' into SharedBranch
Modified test in Subfolder1master.txt
Merge branch 'master' into SharedBranch
Modified text in Tracydoc.txt