hope i didn't break anything
Fixed some shit
Merge branch 'master' of https://github.com/bitterlozenges/cs51-finalproj
fixed merge connflicts in analyze