fixes
Merge branch 'master' of https://github.com/frankbaffle/cs279-hw2