Added Merchant and Soldier NPCs.