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

fixes fucked merge
Merge pull request #6238 from Cuboos/CuboosSoundS1E1

Cuboos sound s1 e1