Merge pull request #80 from spotfinder/mike

updated reservation controller
reservation controller