* edit.html使用定制化form
Merge branch 'master' of github.com:oneyoung/django-blog

Conflicts:
	blog/views.py