track class added
track class added
Merge branch 'track-class'

Conflicts:
	MusicOrganizer.class