week 5
week6

week 6
Merge pull request #35 from ada-linda/master

week 5