week 6 work
Merge pull request #62 from alisonsexton/master

week 6 work