動作テスト
再修正
Merge remote-tracking branch 'origin/travis_ci'

Conflicts:
	spec/controllers/backgrounds_controller_spec.rb