Feature two. Commit 2
Merge remote-tracking branch 'origin/2-feature' into develop

Conflicts:
	README.md
Merge remote-tracking branch 'origin/2-feature'

Conflicts:
	README.md
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	README.md