Add git merge to the expanded numeric commands
Merge pull request #106 from tuxinaut/master

Add git merge to the expanded numeric commands
Added git stash pop alias (gashp)