Angels wept at the excellence of this commit message
Merge branch 'add-a-feature'

Conflicts:
	README.md