stuff
Merge branch 'master' of https://github.com/bstamour/emacs-config

Conflicts:
	modules/core.el