Merge commit '1c595ee331c17c9bc885f3de942378b489b69eef' into develop

* commit '1c595ee331c17c9bc885f3de942378b489b69eef':
  ブランチdevelop2用　作成

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

* master:
  コミット

Conflicts:
	index.html