main.cpp updated(M7)
Merge branch 'master' of https://github.com/TS-RTX1911/Test_GL