model.py 修正

Signed-off-by: yuichi takada <sibukixxx@gmail.com>
Merge remote-tracking branch 'origin/master'

Signed-off-by: sibukixxx <sibukixxx@gmail.com>

Conflicts:
	mysite/polls/admin.py
	mysite/polls/models.py