This will be forcing a merge conflict
Merge branch 'master' into merge_conflict_branch

Conflicts:
	Test.txt
Merge pull request #2 from jeremydocken-wf/merge_conflict_branch

This will be forcing a merge conflict