とりあえず動く。β版的なね
Merge remote-tracking branch 'origin/master'