Modified file init.el.
Merge branch 'master' of github.com:paulotome/.emacs.d