Merge branch 'shirokane_branch'
Update ぷるり Practice2

mergeの練習
Merge branch 'seijit_pr'

Conflicts:
	ぷるり
Update ぷるり
conflict fixed....