Reworked <track> parsing.
Merge branch 'master' of github.com:nbish11/Moovie