Obj #147

Merged r-isitani merged 2 commits into nitta-lab-2018:master from nitta-lab-2018:obj on 24 Oct 2018
2018-10-23
playerも修正
y-ota committed on 23 Oct 2018
nullpo修正
y-ota committed on 23 Oct 2018