tamaizumi
Merge branch 'master' into tamaizumi
コンフリクトだああああああ
Merge branch 'master' into tamaizumi

Conflicts:
	shared
ははい
miss
Merge branch 'tamaizumi'

Conflicts:
	shared