feature 2
feature 2 change 2
Merge branch 'feature2' into develop

Conflicts:
	README.md