Assigning Scores
Added Roll sheet
Overwrite
Ready for Push
PUSH
Trying to get on git

Errors
Merge branch 'dev' of https://github.com/graemeb52096/AHS-Freshmen-Debates into dev

Conflicts:
	freshmendebates/Logs/debug.log
	freshmendebates/debates/__init__.pyc
	freshmendebates/debates/admin.pyc
	freshmendebates/debates/forms.pyc
	freshmendebates/debates/models.pyc
	freshmendebates/debates/views.pyc
	freshmendebates/freshmendebates.db
	freshmendebates/freshmendebates/__init__.pyc
	freshmendebates/freshmendebates/settings.pyc
	freshmendebates/freshmendebates/urls.pyc
	freshmendebates/freshmendebates/wsgi.pyc
	load_teacher_data.py