saving chagnes to my-emacs
Merge branch 'master' of https://github.com/TrevorDecker/Config