modificando models.py y views.py
Merge branch 'master' of github.com:JEnriquePS/Poll_tutorial_django

Conflicts:
	.gitignore
	myproject/poll/models.py
	myproject/poll/views.py