preparing for devise
adding devise and a User model
adding omniauth and configuring with devise
omniauth callbacks implemented; no more validate email or password
back to the way things were
Merge branch 'new_branch'

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/welcome_controller.rb
	app/models/user.rb
	app/views/layouts/application.html.erb
	config/environments/development.rb
	config/initializers/devise.rb
	config/initializers/twitter.rb
	db/schema.rb