Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring

db/migrate/20170811052036_create_dining_charges.rb

@@ -10,6 +10,7 @@ class CreateDiningCharges < ActiveRecord::Migration[5.1]
       t.time :charge_block
       t.string :time_rounding, :default => "down"
       t.time :time_rounding_block
+      t.integer :time_rounding_block_price, :default => 0
       t.timestamps
     end
   end