commiting
Merge branch 'master' of github.com:atulp-iprogrammer/gitpractice

Conflicts:
	ganesh.txt
Merge branch 'master' of github.com:atulp-iprogrammer/gitpractice

Conflicts:
	ganesh.txt