Aula 5.2
Merge remote-tracking branch 'origin/master'

Conflicts:
	cursodjango/settings.py
Revert "Aula 5.2"

This reverts commit 4be5edb8fbe5e75b5970659d7a951811de88d8f1.