Work in progress, #30
Merge branch 'ballot-submission-model' of github.com:czlee/tabbycat

Conflicts:
	debate/forms.py
	debate/models.py
	debate/result.py
	debate/views.py
	templates/enter_results.html
	templates/enter_results_ballot_set.html
	templates/monkey/enter_results.html