1
Merge branch 'feature/mynew-feature' into develop

Conflicts:
	README.md