Merge branch 'master' of https://github.com/allenpark/SimmonsElections

Conflicts:
	SimmonsElections/polls/views.py
Merge branch 'master' of https://github.com/allenpark/SimmonsElections

Conflicts:
	SimmonsElections/polls/views.py