third commit
commiting again
commiting again
Merge branch 'master' of github.com:atulp-iprogrammer/gitpractice
commiting
Second commit
Test
Merge branch 'master' of github.com:atulp-iprogrammer/gitpractice

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

Conflicts:
	ganesh.txt
adding in dev:wq
:
commited from master
remoived from rep
Merge branch 'dev' of github.com:atulp-iprogrammer/gitpractice into dev

Conflicts:
	.gitignore
changed by mithun