Fixes for google auth
fixed nav UI for landing page
resolving merge conflicts
Merge pull request #4 from dudhead/master

Fixes for google auth