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
wf

effe
Revert "wf"

This reverts commit 4246c6be89fde5c1ee0eb129c8d0bd6f96472c6e.
Revert "wf"

This reverts commit 4246c6be89fde5c1ee0eb129c8d0bd6f96472c6e.
刪除<<<<end

怪資料
Merge branch 'Evevnt-and-Tags'

Conflicts:
db/schema.rb
add migrate provider

add users cloumn provider uid name
Merge branch 'add-provider'
Merge branch 'master' into Evevnt-and-Tags

Conflicts:
	db/schema.rb