I don't know what I changed
fixed merge conflicts
Ctrl names.
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
minor changes
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
Fixes controller name list.
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
Merge pull request #37 from jacob-israel-turner/master

ctrl names
Merge branch 'master' of https://github.com/lds-reporting/site-reporting