merge conflicts in TrackModel
fix bugs and begin GUI components
merge conficts in TrackModel