ch6
Merge branch 'modeling-users'
ch6
ch7
Add SSL in production
ch7