Adaptacao ao esquema do ministerio.
ignora arquivo tramp'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Use Droid Sans Mono-11 by default.
Merge branch 'master' of https://github.com/carcara/prelude

Conflicts:
	README.md
	personal/personal.el
Ediif divide o frame horizontalmente por padrao.