First addition to file A
Added file B to master
Added C
Merge branch 'master' into branchA

Conflicts:
	A.txt
Merge branch 'master' into branchA