fixed all bugs
Merge branch 'master' of https://github.com/11693-01/project-team01.git