code added
updated
Merge branch 'master' of github.com:zzhang1987/emacs.d

Conflicts:
	init.el
Merge branch 'master' of https://git.zzhang.org/emacs.d

Conflicts:
	config/latex.el
	init.el
updated
Merge branch 'master' of https://git.zzhang.org/emacs.d
add mkexe