Merge branch 'lesson6'
Merge remote-tracking branch 'origin/master'