Changed to lines 1 and 2
Merge branch 'master' of https://github.com/uswebcoders/test6

Conflicts:
	test4.txt