week 7
Merge pull request #41 from gsus3jo/master

week 7