Add gibberish to newfile.txt and delete excess blank lines
Merge branch 'master' of https://github.com/jfking/testrepo

Conflicts:
	newfile.txt