week 7
Merge pull request #71 from annemdannem/master

week 7