week 3
Merge pull request #1 from jamesmacaulay/master

Week 3