small changes
Merge branch 'master' of https://github.com/katiecanada/cs247-video-reactions
fixed bug:
fixed conflicts