rspec追加
Merge commit '4b339e547f23f60000b94eee42b5b8a61c1cb336' into wip/feat/1225
Merge branch 'wip/1230_views'

Conflicts:
	Gemfile.lock
Merge branch 'master' into wip/feat/0107_comments
add rubocop test ignore