Updated the server URL
Merge branch 'master' of https://github.com/jballands/ShopMaster