week 6!
Merge pull request #59 from Zion1/master

week 6!