changed receive1 to be one video and flash emoticons on top
Merge branch 'master' of github.com:jimyw/cs247-2104-p3
merge
flipped keyup and keydown