init.el
merge
Merge branch 'master' of https://github.com/jkshum/emacs

Conflicts:
	.emacs.desktop
	.emacs.desktop.lock
	ac-comphist.dat
	flycheck_init.el
	ido.last
	recentf
Merge branch 'master' of https://github.com/jkshum/emacs

Conflicts:
	.emacs.desktop
	.emacs.desktop.lock
	ac-comphist.dat
	flycheck_init.el
	ido.last
	recentf