local changes
Merge branch 'macos' of https://github.com/haksior/emacs-configuration into macos

Conflicts:
	site-lisp/golden-ratio.el