Ha, I picked up a triangle!
Merge branch 'ryland' into micah
Fixed the undefined player