remove lame parts from CTC
merge conflicts
fix merges in scheduler
Update constData.java
Update Scheduler.java
hi
merge

Merge branch 'master' of https://github.com/tnason/CoE1186
m
Merge branch 'master' of https://github.com/tnason/CoE1186