5行目と8行目を変更
Merge remote-tracking branch 'origin/master' into aya0-2

Conflicts:
	numbers
Merge branch 'aya0-2'