merge conflicts fixed so that the thing works again.
merge conflicts fixed so that the thing works again.

codeforamerica/mdc-feedback,codeforamerica/mdc-feedback,codeforamerica/mdc-feedback,codeforamerica/mdc-feedback