feature a commit
Merge feature 'a' into develop

Conflicts:
	README.md