update spec/models/user_spec.rb
Merge branch 'modeling-users'
add user authentication to master