master　コンフリクトテスト
Merge branch 'subBranch'

Conflicts:
	app/views/projects/index.html.erb