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

Conflicts:
	README.md
4
Merge branch 'release/1.0'