added sounds.
Merge remote-tracking branch 'Tylor/master'
Clean up sound loading