added users with username and hashed passwords
Merge branch 'users'