merge admin, user edits
merged changes from admin
finished #9 admin user, delete users