Add change to create a conflict.
Merge branch 'master' of https://github.com/davidjwalter/GitTest

Conflicts:
	README.md