mensagens funfando
Merge branch 'master' of https://github.com/nishi13/pj25

Conflicts:
	sistema/templates/egplus.html