hosaka
tamaizumi
oshima
Add tokuhisa
Merge branch 'master' into tamaizumi
Merge branch 'master' into hosaka
Merge branch 'master' into tokuhisa
merged

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

Conflicts:
	shared
Merge branch 'master' into tamaizumi

Conflicts:
	shared
conflict fixed
Merge branch 'master' into tokuhisa

Conflicts:
	shared
Merge pull request #1 from white-chocolate/hosaka

Hosaka
Merge remote-tracking branch 'origin/master' into tokuhisa

Conflicts:
	shared
Merge pull request #2 from white-chocolate/tokuhisa

Tokuhisa
Merge branch 'master' into oshima

Conflicts:
	shared