Arpit: add line in testing file
Merge branch 'master' of https://github.com/arpit625/learn_git
Arpit : git confict solved

Conflicts:
	testing.txt