Testing creation of samename file from GIT PC
Merge branch 'master' into B1

Conflicts:
	test.txt