An example pull request.
Merge pull request #2 from johnbburg/pull/request

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

Conflicts:
	README.md