small commit to enable pull no changes
getting rspec gem to appear
update Gemfile and add user attributes to support generic login authentication
correct merge conflict in schema to keep most recent version that includes generic authentication attributes for user