make users show page and resolve conflict in models/user.rb. ???
chap 7.1.3 done. conflict resolved in user_spec.rb.
Finish signup