local change in line 3
Merge branch 'master' of https://github.com/Rammy48/testrepo.git

Conflicts:
	testdoc.txt