Make a different edit to newfile.txt
Merge branch 'master' of https://github.com/jfking/testrepo

Conflicts:
	newfile.txt