Merge branch 'develop'
Merge branch 'master' into develop
zshrc:added ZLE config
.zshenv:moved&fixed proxy setting from .zshrc
.zshrc:deleted proxy setting, changed comment format
init.el: completely new versiong add home/.emacs.d/init.elg add home/.emacs.d/init.elg add home/.emacs.d/init.el