Merge branch 'development'
Fixed the class George is teaching
Merge branch 'master' into development
Fix schedule, redo model
Merge branch 'master' into development
Add the title