サンプル:articleとcommentの関連をテスト
Merge branch 'develop' of github.com:rawhide/simpleblog into feature/minitest_sample

Conflicts:
	app/models/article.rb
	test/models/article_test.rb
太田さんのテストに合わせてfactory_girlの値を修正
Merge branch 'develop' of github.com:rawhide/simpleblog into feature/minitest_sample
Merge branch 'feature/minitest_sample' into develop
Merge branch 'develop' of github.com:rawhide/simpleblog into develop

Conflicts:
	app/models/article.rb
Merge branch 'develop' of github.com:rawhide/simpleblog into develop