Added password hasher class
Trying to fix merge conflicts
Fixing merge issues