Merge remote-tracking branch 'origin/Daniel+'
Java code can compile, Timeslot constructor incomplete

I didnt find a regular expression for splitting the string yet.
4
Merge remote-tracking branch 'origin/Daniel+'
Merge branch 'master' of https://github.com/niode/cpsc433
Merge pull request #5 from niode/nathan

4