message responsive to video repeat
commit
fixed conflicts
Merge branch 'lisaj0323-master'
Merge branch 'master' of https://github.com/475Team/hackathon