comitting what i have; scheduler and test data generator
Merge remote-tracking branch 'origin/master'