Added 4th line
Merge branch 'master' of github.com:gregtheyoung/GitExtTest

Conflicts:
	Added file.txt