テスト削除
修正
修正
Merge branch 'master' of https://github.com/oukyou/oukyou_test into oukyou

Conflicts:
	app/test.rb
aaa