Week 7
Merge pull request #67 from aprilkw/master

Week 7