Update main and qml's
Merge branch 'day2_team3' of github.com:SchoolCCLE/SchoolProject into day2_team3