a
a
a
Merge branch 'master' of https://github.com/pcompassion/emacs-config

Conflicts:
	.emacs.d/history
	.emacs.d/init.el