Merchants and two 'new' weapons

Change Log

• Added a merchant to the game which is actually a new location.
• Merchants sell gear.
• I'll probably also add merchant booths in other places.
• Added a metal boomerang and bow. More damage and range.