branch1と競合する修正をプッシュ #4

Merged n-nitta merged 1 commit into nitta-lab:master from nitta-lab:branch2 on 15 Jun 2017

2017-06-15	0fce77f Browse files » branch1と競合する修正をプッシュ n-nitta committed on 15 Jun 2017