Merge pull request #1 from cblokker/avi-additions

Avi additions
Merge pull request #2 from cblokker/avi-additions

add sample palyer
playing with synth models
:wq
Merge branch 'audio_test' of https://github.com/cblokker/spotify_hackathon into audio_test
merge conflict rsolve
staging for commit
staging for merge - again
fixing merge conflict
added .wav trigger on swipe gesture
Merge branch 'audio_test' of https://github.com/cblokker/spotify_hackathon into avi-additions
adding stuff from guys
refactor
Merge branch 'audio_test' of https://github.com/cblokker/spotify_hackathon into avi-additions
add chases additions