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

Conflicts:
	init.el