ramuniku
saaya
Merge remote-tracking branch 'origin/master' into saaya

Conflicts:
	numbers
ramuniku
saaya
yamashiro
10行目を変更
Merge remote-tracking branch 'origin/yamashiro' into aya0
Merge remote-tracking branch 'origin/ramuniku' into aya0

Conflicts:
	numbers
Merge remote-tracking branch 'origin/aya0'