New one
Merge branch 'master' of https://github.com/linktosriram/sampleRepo

Conflicts:
	new1.txt