gg
Merge branch 'master' of https://github.com/glazou/test.git

Conflicts:
	fileC.txt