week 7 work
Merge pull request #44 from samlovesemail/master

week 7 work