Added time blocking for editing a reservation changed r_id to reservation ID in views
Merge branch 'master' of https://github.com/alwilson243/splurge