refactored maincontroller
Merge branch 'master' of github.com:webhippie/music