user model tests and added 'devise' gem to Gemfile
fixed merge conflicts when trying to merge branch user_testing_sl to development