pset3 commit
Merge https://github.com/ZekeMill/pset3