modified:   .emacs
Merge branch 'master' of https://github.com/abelardojarab/emacsfull

 Please enter a commit message to explain why this merge is necessary,