devise ok
ok
facebook

add facebook login
add google login

google login ok
還在修改中

no change
Merge branch 'add-google-openid'

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/main.css.scss
	app/views/main/home.html.erb