third line from second git
Merge branch 'master' of https://github.com/bjoern-guenter/crashtestdummy

Conflicts:
	firstFile.txt