more audios added
resolve conflicts
Merge branch 'master' of github.com:jamc/madeinjam