Translation of 6 chapter
Merge remote-tracking branch 'origin/06-adding-users'