test : 修正
Merge branch 'master' of https://github.com/ficc/git_test into test_staging

Conflicts:
	index のコピー.html