init
Merge branch 'master' of github.com:guoxiangyang/emacs_conf