updated sound and camera scripts
fixing merge conflicts
fixing merge conflicts