added query in reports_controller and appointments model
resolving merge conflicts in reports controller with patbranch after adding reports queries
fixed merge conflicts with patbranch
added query in reports_controller and appointments model
gemflie lock was deleted...
merging conflicts with stephs stuffs
Update getHoursReport2DArray to make non-CSV, 3-layered hashmap