added audio playing stuff
fixed merge conflicts