testing authentication
merging upstream/master
add to trends
fix names
merging upstream/master
Merge branch 'master' of https://github.com/eklyman/site-reporting into eklyman-master
Merge branch 'eklyman-master'
Merge branch 'master' of https://github.com/jasonalmaturner/site-reporting into jasonalmaturner-master

Conflicts:
	server.js
Merge branch 'jasonalmaturner-master'
Merge branch 'master' of https://github.com/lds-reporting/site-reporting

Conflicts:
	public/index.html
Merge pull request #67 from jacob-israel-turner/master

Merges, fixing login.