Customisation Emacs
Merge branch 'master' of github.com:sroccaserra/dotfiles

Conflicts:
	custom.el