omniauth
fixed callback
finished controller
resolve merge conflicts