アイテムパーツ完了です。
Merge remote-tracking branch 'origin/master'

Conflicts:
	RunningAdventure/Assets/UnityChan2D/Scripts/UnityChan2DController.cs