testing authentication
merging upstream/master
fixes login, still need to figure out the session.
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
Merge pull request #64 from jacob-israel-turner/master

fixes login, still need to figure out the session.
the index dit not reflect
fernanda
merging upstream/master
Merge pull request #65 from FernandaS/master

the index dit not reflect
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.
so close
Merge pull request #68 from jasonalmaturner/master

so close
Login stuff.
Merge branch 'master' of https://github.com/lds-reporting/site-reporting

Conflicts:
	server.js
setting ng-models in for the add site section