Enable desktop-save-mode
Merge branch 'master' of https://github.com/louisch/dotemacs
Save state of emacs with desktop-mode

Conflicts:
	init.el