merged
Merge branch 'master' of https://github.com/jkshum/emacs

Conflicts:
	.emacs.desktop
	.emacs.desktop.lock