Ativação do Admin no urls.py
Merge branch 'master' of https://github.com/almeidajeff/ProjetoTarde
Começando as views
Merge branch 'master' of https://github.com/almeidajeff/ProjetoTarde

Conflicts:
	ProjetoTarde/urls.py