update with omniauth
update code from conflit and >>>>>>> 40d7591953bf2a03f1f2ba065281db5caee986b6