Fixed mixing audio
Merge branch 'master' of github.com:chris-hudson/impromptica