chap 7.1.3 done. conflict resolved in user_spec.rb.