set up backend part of authentication with passport
set up backend part of authentication with passport
fix merge conflict
Merge pull request #29 from lpappone/authnew

set up backend part of authentication with passport
Merge pull request #30 from BeerWithMe/staging

Staging