delete file by vishal
test 44 for conflict
test for conflict by vishal
Merge branch 'master' of https://github.com/amitpatel111/test2
test commit for conflict by vishal
Merge branch 'dev-girish'

Conflicts:
	test44.txt
solve conflict in master by vishal
Merge branch 'master' of https://github.com/amitpatel111/test2