add convo
Merge branch 'audio_test' of https://github.com/cblokker/spotify_hackathon into avi-additions
adding stuff from guys
Merge branch 'audio_test' of https://github.com/cblokker/spotify_hackathon into avi-additions
add chases additions
Merge pull request #3 from cblokker/avi-additions

convolution patches added