n
Merge branch 'master' of github.com:huangyingw/root
n
merge from mac branch
add alias gstp, which will pop out the stash change
merge from master