merging upstream/master
merging upstream/master
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
Merge pull request #99 from bloodhawk/master

adds userobj to authcheck
merging upstream/master
fixing merge conflicts
fixing mistake I made
Testing bcrypt with passport
Merge pull request #100 from jasonalmaturner/master

Testing bcrypt with passport
changes where in userserver and adds phantom render for controller
fix merge conflict