Adding sound effects and merging TimBranch
Merge branch 'LewisBranch' of https://github.com/reggiegg/emotion into LewisBranch