More stuff
Merge branch 'master' of github.com:mikefranz/SoundCamp

Conflicts:
	SoundCamp/sound.js