added line no 6
Merge branch 'master' of https://github.com/anuragkala2009/dotNetTest

Conflicts:
	test1/test1.txt