changing something to cause a conflict
Merge branch 'master' of https://github.com/jacobwsac/gittest

Conflicts:
	text.txt