made some changes
Merge pull request #23 from CorbinFoucart/rebeccaEdits

made some changes