merge conflicts in TrackModel
Merge pull request #33 from jamesclampffer/master

Track Model updates
TM changes
Merge pull request #34 from cnd11/master

Updates
Update .gitignore
controller in TM
controller in TM
Merge pull request #35 from cnd11/master

updated Controller
everything
Merge pull request #36 from cnd11/master

everything
fix bugs and begin GUI components
merge conficts in TrackModel
Fixed warnings, removed uneccessary messages, added timer to MBO
made CTC squack
Update TrainController.java
Update TrainControllerGUI.java
Update TrainControllerModule.java
Merge branch 'master' of https://github.com/tnason/CoE1186

merge latest changes
Fixed warnings, removed unecessary messages, added timer to MBO
merge conflicts on scheduler