hosaka
tamaizumi
oshima
osada
Add tokuhisa
add daimar
Merge branch 'master' into osada
Merge branch 'master' into tamaizumi
Merge branch 'master' into hosaka
Merge branch 'master' into tokuhisa
merged

Merge branch 'master' into oshima
Merge branch 'master' into daimar
shared -> hosaka
コンフリクトだああああああ
shared -> oshima
osada
Change shared
hey
Merge branch 'master' into hosaka

Conflicts:
	shared
Merge branch 'master' into tamaizumi

Conflicts:
	shared