beginning work on user validations
user model validations and rspec done, sans password_confirmation rspec
commented out password validations, validations and their specs for user otherwise should be done.
fixed validations conflicts
fixed merge conflicts in user.rb