implementing password hashing
merged changes