Update TrainControllerModule.java
all
merge conflicts in scheduler
Merge pull request #42 from cnd11/master

changes to block/ yard
Update TrainControllerGUI.java
Update TrainController.java
Finished train messaging
Update TrainControllerModule.java
Merge branch 'master' of https://github.com/tnason/CoE1186
[TrainModel] Handled train destruction
add ability to dispatch via CTC Gui
merge conflicts in trainmodel and scheduler