login and logout function by devise
add twitter auth function by omniauth_twitter
fix conflicts
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/user.rb
	app/views/layouts/application.html.erb
	config/initializers/devise.rb
	config/routes.rb
	db/schema.rb