Added SOIL, fixed Sound bugs
Added SOIL, fixed Sound bugs, fixed merge conflict