Fix B
Fix Conflicats!

Conflicts:
	README.md
Add feature-C
Merge branch 'feature-C'