edited
edit abc
edit file
edited
edit stash
Merge branch 'master' of github.com:aarif101/gitDemo

Conflicts:
	abc.txt