added setters/getters to Reservation and added reservation ID
Merge branch 'master' of https://github.com/trosne/progU48