Merge pull request #26 from ZomgPonies/master

Merge from Master
Music Updates
Merge pull request #457 from Fox-McCloud/Music-Updates

Music updates
Merge pull request #4 from ZomgPonies/master

merge 01.11.14