アイテム追加
Merge remote-tracking branch 'origin/master'

Conflicts:
	survival_game/Assets/Scene/TestScene.unity