merging from master
resolve merge conficts
fix merge
add reports
fix styles
Merge pull request #30 from eklyman/master

reports modals
typo
Merge pull request #31 from jacob-israel-turner/master

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