Adiciona configuração do django
Merge branch 'master' of github.com:junkatana/django-blog

Conflicts:
	django_blog/blog.db
Merge branch 'master' of github.com:junkatana/django-blog
Merge branch 'master' of github.com:junkatana/django-blog
Merge branch 'master' of github.com:junkatana/django-blog
Adiciona config do servidor
Corrige conlito com config com servidor

Adiciona git config name e email

Merge branch 'master' of github.com:junkatana/django-blog

Conflicts:
	django_blog/django_blog/settings.py