Feature one
Merge pull request #1 from smeade/1-feature

Feature one
Feature two

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

Conflicts:
	README.md