Merge branch 'master' of github.com:qjcg/soundapp
Merge branch 'master' of github.com:qjcg/soundapp
connecting stuff