Initial stuff
yay
Merge branch 'master' of https://github.com/robertsychen/CS125Pset2

idk idk idk
fixing problems