week 6

week 6
week 6

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

week 6