detail.html
commit all
Merge branch 'master' of https://github.com/ytsschool/main

Conflicts:
	site2/polls/templates/polls/detail.html
	site2/polls/templates/polls/index.html
	yts/ContributionBlog/models.pyc