merging with upstream
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
merging upstream/master
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
merging upstream/master
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
fixed type
Merge pull request #50 from jasonalmaturner/master

Working on authentication.
Merge branch 'master' of https://github.com/lds-reporting/site-reporting