week 7 submission
Merge pull request #42 from Zion1/master

week 7 submission