Music works (browsers/js sucks)
Merge branch 'MusicTest'

Conflicts:
	setup.js
	world_objects.js