Updated emacs config
Merge branch 'master' of github.com:Elzair/emacs-conf