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

Conflicts:
	.emacs.desktop
	.emacs.desktop.lock
	ac-comphist.dat
	init.el
updated init.el