Merge branch 'master' of https://github.com/jvheerde-demo/test-repo

Conflicts:
	README.md
Merge branch 'master' of https://github.com/jvheerde-demo/test-repo

Conflicts:
	README.md