快捷键、简单背景色设置
Merge branch 'master' of github.com:zcwj/emacs

Conflicts:
	.emacs