added show, edit, update, and destroy actions in controller
corrected merge conflicts in controller