added new stuff for the scheduler file
Merge branch 'master' of https://github.com/hyperkerfuffle/824