koike_branchを作成して、index.htmlを修正
refs #00001
Merge branch 'master' into takahashi

Conflicts:
	index.html
コミット小池
Merge branch 'koike_branch'
Merge branch 'master' of github.com:tyrellsys/group1 into lucypark_0513

Conflicts:
	index.html
Merge branch 'master' into lucypark_0513

Conflicts:
	index.html