merge conflicts in TrackModel
Merge pull request #36 from cnd11/master

everything
fix bugs and begin GUI components
merge conficts in TrackModel
test