added lots o sounds
Merge branch 'master' of https://github.com/ericlathrop/apt-213-the-struggle
animationsssssss
fixed fucktons of merge conflicts