Final changes to styling and language
Merge branch 'master' of https://github.com/Sarfaraaz/Project-DL
Merge branch 'master' of https://github.com/Sarfaraaz/Project-DL
Merge branch 'master' of https://github.com/Sarfaraaz/Project-DL
Merge branch 'master' of https://github.com/Sarfaraaz/Project-DL
Fixed classroom topic and classroomtype