Added Users
Merge branch 'adding-users'