add Omniauth gem for google oauth2
add google auth to view, controller, config and routes
generate model and migration files for auth_provider and authorization
add respective associations to user and auth_provider models
resolve merge conflicts