Updating the javascript files so I can go back to my branch
Trying to fix up merge with master
Experimented with music block colour and some bug fixes.