sorry for shitty code
Merge branch 'master' of https://github.com/Stephaninos/CS-156b