Added Armor shop and Weapon Shop
Merchant street links added
Armor and Weapon adjustments