week 5 changes
week 6 - catching up
Merge pull request #47 from englishandy/master

week 5 changes