fixed some shit
Merge branch 'master' of github.com:CinnamonBagels/cse134b-group17