Implemented proper data structures for a session and time slot.
Merge remote-tracking branch 'origin/master'