user 2 edit line 15
Merge branch 'master' of https://github.com/DavidVine/test-multi-user-repo

Conflicts:
	README.md