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

Conflicts:
	test.txt.txt
first commit