adding show and edit pages, update functionality
fixing merge conflicts in routes.rb