commented out some scope methods in reservation model
resolving merge conflicts
Merge branch 'master' of https://github.com/thekreal/seat_yourself