Consulta quase la
Merge branch 'master' of https://github.com/paulomoreno/DAS

Conflicts:
	main/models.py
	main/views.py
Consultas quase acabando