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