twitter login nearlyyyy
Merge branch 'master' of github.com:rubymonsters/speakerinnen_liste
halfwaythroughrailscasttutorial235

Conflicts:
	Gemfile.lock
	app/controllers/omniauth_callbacks_controller.rb
	app/models/profile.rb
	config/routes.rb
	db/schema.rb
fixes error
update gemfile lock