Implemented scheduler for prediction code
predictor.py changes didn't commit for some reason...
Merge branch 'master' of https://github.com/cruncher19/Ubicomp-GPP

Missed a few changes before I pushed, had to merge