lecture 4 ready
Merge branch 'fixweek4'