working on 'destroy'
Merge branch 'updating-users'