Jason's changes #bs-44
This shouldn't work
Merge branch 'master' of https://github.com/jasondentler/GitDemo into bs-44-conflict

Conflicts:
	Text1.txt
Merge pull request #3 from jasondentler/bs-44-conflict

Jason's changes #bs-44