Merge remote-tracking branch 'origin/test_fileC'
Line 4 in C
branch2, change in FileC
Other master branch line
Merge branch 'branch2'

Conflicts:
	FileC.txt
after the merge
Merge remote-tracking branch 'origin/master' into test_fileC

Conflicts:
	FileC.txt