implemented show edit update destroy actions
resolved merge conflict on user_controller.rb