commit for confilcted file content change
Merge branch 'master' of https://github.com/marcoconut/training

Conflicts:
	file1.txt