refine
add path
Merge branch 'master' of github.com:pengjia/dotfiles

Conflicts:
	_zshrc
update the emacs file
Merge branch 'master' of github.com:pengjia/dotfiles
Merge branch 'master' of github.com:pengjia/dotfiles

Conflicts:
	_emacs
update submodule