Change 1 in two
Merge branch 'master' of https://github.com/nkavanagh/conflict-demo

Conflicts:
	README.md