Anna's assignment 2 submission.
Merge pull request #89 from annaswigart/master

Anna's assignment 2 submission.