adding
Merge branch 'master' of github.com:pcompassion/.emacs.d