Changed location of javascript files and did other changes
Merge branch 'master' of https://github.com/matthewgrossman/MusicProductivity
Merge branch 'master' of https://github.com/matthewgrossman/MusicProductivity