added git stash alias
Merge branch 'master' into laptop