New merchants and coins
Merge pull request #25 from Waterloodown/master

New merchants and coins