Added merchant/shop restocking

100 needs to be reset to 14400 * 3 after testing