bug fixed
Merge branch 'master' of https://github.com/RedrockTeam/FrontEnd_exam
bug