Fixed time
fixed router
Merge branch 'master' of https://github.com/tnason/CoE1186
Update TrainController.java
Update TrainController.java
Merge pull request #11 from tnason/master

and again