Change-background-yellow
Merge branch 'master' into change-background-red

Conflicts:
	index.html
Merge pull request #2 from increments-git-training/change-background-red

背景を黄色に変更しました