trying test_fileC branch v2
Merge remote-tracking branch 'origin/master' into test_fileC

Conflicts:
	FileC.txt
dev on master branch...
more local dev
new feature in file B&C
more dev on master...
next one
Merge branch 'master' into another

Conflicts:
	fileA.txt