Merge pull request #2 from lynch-a/master

Nothing important.
Updated version of Mp3 class---nice and clean-ish.
Merge pull request #3 from lynch-a/funbranch

Funbranch