fix bug
Merge branch 'master' of https://github.com/farcryzry/CMPE272-Group8