undoes tortoisegit merge fuckery
proper sound changes
path fixes
Merge pull request #2 from hornygranny/amberlamps

fixes fucked merge