Changed name from "testfile" to "testfile.txt"
changed filename
modified 1st line
changed file name (master)
Merge branch 'doctor'

Conflicts:
	testfile.txt