changed this
This shouldn't work
Merge branch 'master' of https://github.com/jasondentler/GitDemo into bs-44-conflict

Conflicts:
	Text1.txt