week 2 work in progress
Merge pull request #16 from fredoak/master

week 2 work in progress