can kind of add stashes and heaps now
Merge branch 'master' of github.com:zhangmarvin/stash