about to do some major merging
merged changes
Merge branch 'master' of https://github.com/lteamcs98/interactiveclassroom