added forth line
Merge branch 'master' of https://github.com/vikramsalunke/testrepo

Conflicts:
	test.txt.txt