interval logic functional
resolved merge conflicts in interval.rb and users_controller.rb