Update ぷるり

Mergeの練習
conflict fixed
Merge branch 'shirokane_branch'