Conflict fix
Conflict fix

california-civic-data-coalition/django-calaccess-raw-data,adborden/django-calaccess-raw-data,jsfenfen/django-calaccess-raw-data,Charlex/django-calaccess-raw-data,anthonyjpesce/django-calaccess-raw-data