Added the file Master.txt
Merge branch 'master' into Branch1
Updated the document with what has been done.
Updated the file to indicate that it was merged into master.
Update Branch1.txt
Update Branch1.txt

I verified that this worked.
Update Branch1.txt

Closes #4...
Update Branch1.txt
Modified Master.txt in the master branch.
Updated the Testme.txt file.
Merge branch 'master' into Branch1

Conflicts:
	Branch1.txt