django first
Merge https://github.com/p00gz/Django-blog
issues.
first
Merge https://github.com/p00gz/Django-blog
issues
second
fix staticfiles
Merge branch 'master' of https://github.com/p00gz/Django-blog
same issues
Conflicts:
	MyBlog/mysite/settings.py
	MyBlog/mysite/wsgi.py
fixed settings.py
Delete #base.html#
Delete base.html~
Update urls.py
Update blog.html
Update tags.html
test