first commit on git-demo
add git-demo-conflict
add git-stash
Merge pull request #1 from ppeddi2/development

pull request from develpment to master