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

Conflicts:
	.emacs