Added another line 4
Merge branch 'master' of github.com:rhofstet/TestProject

Conflicts:
	hithere.txt