Most recent data structures for Joel
Merge branch 'master' of https://github.com/tylermcatee/ccscheduler
Merging with Joels most recent updates