Add Merchants
Add a shop screen
Implement trading with merchants
Merge branch 'shop'