master1
Merge branch 'branchC' into branchB

Conflicts:
	README.md
branch B after C merge