Config url
Merge branch 'master' of https://github.com/aliceblock/blog_template
Changed
Merge branch 'master' of https://github.com/aliceblock/blog_template

Conflicts:
	models.py