more testing, rm .idea files
rm merge conflict scaffolding lol
Merge branch 'master' of https://github.com/xylochylo/MobAudio