Users index finished
Merge branch 'updating-users'