*first commit
WRING COMMIT 2
*Merge branch 'master' of https://github.com/testdrago/myrepo

Conflicts:
	file2.txt
	index.txt
	myfile.txt