Feature-e 1.
Feature-e 2.
Merge remote branch 'origin/feature-e' into feature-e

Conflicts:
	test.txt
Merge branch 'feature-e' into develop