Fix Friend -> Friends
Fixed error in collision animation code
Merge branch 'master' of https://github.com/dylanswiggett/DubHacksRPS