Stuff
More stuff so far
stuff
Changes
Stuff to add to master
Lab/Lecture creation
Changed some more stuff
Stuff. Let's see if it breaks
Fix things up
Modulated Timeslot class, can instantiate time slot. Added conflicts
Make everything together
Merge branch 'master' of https://github.com/niode/cpsc433
Incomplete commit. In process of making TIme slot an object, and static master time/conflict tables
Final of the day
Nevermind, here's another
Merge pull request #4 from niode/nathan

3
Merge remote-tracking branch 'origin/Daniel+'
Merge branch 'master' of https://github.com/niode/cpsc433
4