Homework 6
Merge pull request #68 from ellenaua/master

Homework 6