copying in files
redid bower, and wrote basic routing
rebased
route fixed
angular is hooked up
conflict resolved
fixed weird commit
fixed head
Merge pull request #32 from bernardchu/feat/auth

Installed passport and passport-google and required them in server. Adde...
Merge pull request #33 from zindlerb/master

angular is hooked up
Merge pull request #34 from COPPER-BOBCAT/staging

Installed passport and passport-google and required them in server.
Merge pull request #35 from zindlerb/master

Fixed weird git messages
Merge pull request #36 from COPPER-BOBCAT/staging

Staging
Installed express-session, added boilerplate passport middleware and authentication function.