Change made to TrunkA in branchC
Merge branch 'branchC'

Conflicts:
	BranchB.txt