coses #71
coses #71
coses #71
coses #71
通らないテストを修正
Merge branch 'travis_ci'

Conflicts:
	spec/controllers/relations_controller_spec.rb