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.
fixed weird commit
fixed head