commit_test
Merge remote-tracking branch 'kimura/master'

Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/layouts/application.html.erb
	config.ru
	config/application.rb
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb
	db/schema.rb
	test/fixtures/users.yml