Feature five
Feature four

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

Conflicts:
	README.md