충돌 해결해야함
Merge branch 'master' of https://github.com/kyungmankim/Capstone-Snapmovie
addAudioActivity- audio play/stop
Merge branch 'master' of https://github.com/kyungmankim/Capstone-Snapmovie