modified:   README.md
Merge remote-tracking branches 'origin/master' and 'origin/feature2' into feature1

Conflicts:
	README.md

	modified:   README.md
testing