Updating controllers and views
Merge branch 'master' of github.com:tnwhwteam/whatsthemusic