Modulated Timeslot class, can instantiate time slot. Added conflicts
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
3
Merge pull request #4 from niode/nathan

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