Merge branch 'helen'
merging master and helen's branch
gerge branch 'master' of https://github.com/InfinityPenguin/ShareSound
confirmed merge works?