made changes to the gun sound so it only goes off after the cooldown and also made the merchant give upgrades