5
Merge pull request #6 from niode/nathan

5
Merge branch 'master' of https://github.com/niode/cpsc433
Timeslot class complete, testing done and is somewhat reliable

Now uses a hashMap to store the conflicts. See TimeslotTest.java for junit test cases.
Merge branch 'master' of https://github.com/niode/cpsc433