ssh
Merge branch 'master' of github.com:himanshuphirke/gitWork

Conflicts:
	Work.txt