Merge pull request #55 from jacob-israel-turner/master

Fixing login.
still hacking away at the authentication
Merge pull request #56 from jasonalmaturner/master

still hacking away at the authentication
Merge branch 'master' of https://github.com/lds-reporting/site-reporting

Conflicts:
	server.js