added routes, added show method on controller, and added show view
merge conflict fixed
merge conflict resolved for show