emacs.d with daemon, it is ok maybe
emacs.d with daemon
Merge branch 'master' of github.com:mofy2yx/emacs.d

Conflicts:
	README.md