modified in test copy
Merge branch 'master' of github.com:SathishSai/TestProject

Conflicts:
	sample files/sample1.txt
	sample files/sample2.txt