teste
Merge branch 'master' of https://github.com/rangeltorrezan/Endireitados

Conflicts:
	endireitadosServer/requirements.txt
porra