Feature two
Feature two

Conflicts:
	README.md
Merge branch '2-feature' of github.com:smeade/flow into 2-feature

Conflicts:
	README.md
Merge pull request #3 from smeade/2-feature

Feature two