Icons and graphics and edited music
Merge branch 'master' of https://github.com/haveblue/MerchantGame