finished lecture 22
Merge branch 'feature/lecture22_from_local'