Week 6
Merge pull request #61 from aprilkw/master

Week 6