I don't know what I changed
fixed merge conflicts
minor changes
Merge branch 'master' of https://github.com/lds-reporting/site-reporting