mac os
Merge branch 'dev' of https://github.com/qinjian623/emacs-config into dev

Conflicts:
	init.el