Scheduler implemented
Merge remote-tracking branch 'origin/personal/trevor' into Jkenney94

Conflicts:
	protos.S