password-hashing complete!
Merge branch 'password-hashing'