Remove cockblock stub that was breaking things
Randomize players
Merge branch 'Flameshadowxeroshin-master'