minor change
:erge branch 'master' of https://github.com/pbailis/info290-project
Linda's changes part 1
Linda's final edits