merge with 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

db/migrate/20170814041543_remove_d_bcols_from_print_settings.rb

@@ -0,0 +1,8 @@
+class RemoveDBcolsFromPrintSettings < ActiveRecord::Migration[5.1]
+  def change
+  	remove_column :print_settings, :db_name, :string
+  	remove_column :print_settings, :db_type, :string
+  	remove_column :print_settings, :db_username, :string
+  	remove_column :print_settings, :db_password, :string
+  end
+end