fixed something
Merge branch 'updating-users'
fixed all yet
finished 9
Merge branch 'updating-users'