added google auth gem and keys
added controller for google auth
fixed merge conflict on gemfile