week 3
Merge pull request #28 from ada-linda/master

week 3