housekeeping 2
Merge branch 'master' of https://github.com/hamster40/ECS165-HW4 into steve