Synced merchant client>server
Revised the merchant system
Merge branch 'master' of https://github.com/TheSlayerMC/RPG.git