readmeの変更
Merge branch 'master' of git://github.com/taniyu/emacs

Conflicts:
	README.md