About to begin testing in section 5 of the tutorial
Merge remote-tracking branch 'origin/master'

Conflicts:
	polls/templates/polls/detail.html