trying to change SFX volume
changing volume for some SFX
removed merge junk
Merge branch 'master' of https://github.com/codecombat/codecombat