Feature B done
Merge branch 'featureB'

Conflicts:
	README.md