feature 2
feature 2 change 2
Update README.md
Merge remote-tracking branch 'origin/feature2'

Conflicts:
	README.md