Added path
Merge branch 'master' of https://github.com/juanre/emacs-conf
random changes
Solved merge conflict
Solved merge conflict