scott commit friday
Merge branch 'master' of github.com:mattame/eecs470