ささしのファイルを変更
sasajima update for tanaka conflict
Merge pull request #6 from rei-m/sasa02

sasajima update for tanaka conflict
Merge pull request #4 from rei-m/tana02

LTGM
Merge pull request #5 from rei-m/matsu02

ささしのファイルを変更
for conflict
Merge pull request #7 from rei-m/sasa03

for conflict
コンフリクトを解消