修改readme
Merge branch 'master' of https://github.com/ExDog/emacs.d

Conflicts:
	README.md