Merge branch 'alex-in-class'
Merge branch 'master' of https://github.com/martinalu/eecs285