Timeslot can be instantiated now.
Curly Braces moved.

No iterator yet.
Change stuff
Merge branch 'master' of https://github.com/niode/cpsc433
Merge pull request #6 from niode/nathan

5
Make some TAallocation stuff. One a_ left!
Bunch more TAallocation changes
e_statements mostly done
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
Tests the timeslot class
Finished assert/evaluate statements. Now need to check all function calls valid
Merge branch 'master' of https://github.com/niode/cpsc433
6
Merge remote-tracking branch 'origin' into nathan