Week 7 Final Work
Merge pull request #47 from fredoak/master

Week 7 Final Work