have added the additional line.
Merge remote-tracking branch 'origin/master'

Conflicts:
	test3.txt
added 4th line
merged