Merge pull request #1 from christinatruong/master

sandrow test
Merge pull request #19 from sandrow/master

Merge pull request #1 from christinatruong/master