HOPEFULLY MERGE CONFLICT
Comment!
Merge branch 'master' of github.com:domtancredi/git-test

Conflicts:
	test.txt
Merge branch 'master' of github.com:domtancredi/git-test