#26 Pickup System

DropSystem
-Fixed a merge error