Elaine's Assignment 2
Merge pull request #90 from esedenberg/master

Elaine's Assignment 2