finish chapter6
Merge branch 'modeling-users'

:q