Conflicts:
	coopstory/templates/base.html
	coopstory/templates/coopstory/page.html
	coopstory/templates/page.html
	coopstory/views.py