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

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