changes might be overwritten
Merge branch 'master' of https://github.com/SarahAdelaide/CS124_PA6
dealt with summer again