in-class work
Merge pull request #31 from esthermun/master

in-class work