week 4
Merge pull request #31 from ada-linda/master

week 4