Bugfix
Merge branch 'master' of https://github.com/syoder15/CS98GroupProject