Changed the first line.
Merge branch 'master' of https://github.com/jhawksley/testrepo

Conflicts:
	newfile