added password and encrypted_password attributes to user model