this deleted by amar
Merge branch 'master' of https://github.com/ithands/training

Conflicts:
	test100.txt
this is added by amar