Fixes to assignment 2

closes #115, closes #111, closes #89
Merge pull request #122 from depstein/a2

Fixes to assignment 2
Removing a thing.
Merge pull request #123 from depstein/a2_removal

Removing a thing.