Testing diffmerge
Merge branch 'master' of https://github.com/himanshuphirke/gitWork

Conflicts:
	Work.txt