Qualquer coisa
Merge branch 'master' of github.com:almeidajeff/app-django

Conflicts:
	ProjetoDjango/ProjetoDjango/settings.py
Merge branch 'master' of github.com:almeidajeff/app-django

Conflicts:
	ProjetoDjango/ProjetoDjango/settings.py
Merge branch 'master' of github.com:almeidajeff/app-django

Conflicts:
	ProjetoDjango/ProjetoDjango/settings.py