chapter 6 user model done
Merge branch 'modeling-users'