Week 7 updates
Merge pull request #45 from gsus3jo/master

Week 7 updates