Fixed multiple collisions, players now collide with each other
Merge remote-tracking branch 'origin/master'