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