Updating Test.txt
Merge pull request #1 from jeremydocken-wf/updating_Test_branch

Updating Test.txt
Merge branch 'master' into merge_conflict_branch

Conflicts:
	Test.txt