I forgot what I changed but I did do something so yeah
Merge branch 'master' of https://github.com/stuycs-softdev/proj1-6