new commit
Merge branch 'master' of https://github.com/ncaq/.emacs.d
整理