Fixed conflict issue
added threading for the audio stuff yaaay
Merge pull request #10 from psmagicman/Thread

Thread