fix settings
Merge branch 'master' of https://github.com/lteamcs98/interactiveclassroom