branchC commit
branchC commit
Merge branch 'master' into branchC

Conflicts:
	README.md
Merge branch 'branchC' into branchB

Conflicts:
	README.md