week 7
Merge branch 'master' into answers
mid-term answers
work from week 7