6.1.1 user model
Merge branch 'master' into ch6-modeling-users
end 6.2.2 user validations
end 6.2.2 user validations
end 6.2.2 user validations