prepare to merge
Merge branch 'master' of github.com:chenfengyuan/dotfiles into gensym-ilisp

Conflicts:
	emacs