deleted :password from validations
fixed merge conflicts; uncommented validations in user model
fixed small bug