this is modified by amar
this is new file added by amar
Merge branch 'master' of https://github.com/ithands/training

Conflicts:
	test.txt