whoops, fixed conflict merge
Merge pull request #118 from jeanineann/conflict-fixup

whoops, fixed conflict merge