Fixes to assignment 3 to stuff that's not relevant anymore
Merge pull request #174 from depstein/a4_fixes

Fixes to assignment 3 to stuff that's not relevant anymore