Anna's assignment 6
Anna's assignment 7
Merge pull request #224 from annaswigart/master

Anna's assignment 6