Added Omniauth for twitter
Merge branch 'master' of github.com:kristenhazard/cosmic_shelf

Conflicts:
	Gemfile.lock
	app/controllers/omniauth_callbacks_controller.rb
	app/models/user.rb
	config/initializers/devise.rb
	config/routes.rb
	db/schema.rb
Test commit