implemented devise and facebook omniauth
fixed merge conflicts