An example conflict.
Merge branch 'master' into conflict/test

Conflicts:
	README.md
Merge pull request #4 from johnbburg/conflict/test

An example conflict.