week 4
Merge pull request #38 from englishandy/master

week 4