Added complete catalog controller spec
Changed all 'match' requests in routes to specific routes
Merge branch '404_controller_tests_2' of https://github.com/YaleSTC/reservations into 404_controller_tests_2