file1.txt by doh
Merge branch 'master' of https://github.com/marcoconut/gittraining

Conflicts:
	file1.txt