かお
Merge remote-tracking branch 'origin/master' into hao_3

Conflicts:
	Numbers
add  kamozi:10
hoge
Merge remote-tracking branch 'origin' into 328

Conflicts:
	Numbers