Finished creating the sound library.
Fixed merge conflicts