Homework from week6 plus warmups
Merge pull request #56 from mike1372/master

Homework from week6 plus warmups