added music folder to settings
Merge branch 'master' of github.com:rozifus/TeamStrong13_4