Timetable added place for class. Also added COLOURS *_*
Merge remote-tracking branch 'origin/master'